From a162c5dddc148f0ffe49add1afe1b59bcaf6d66d Mon Sep 17 00:00:00 2001 From: Richard Muzik Date: Mon, 21 Jul 2025 09:47:37 +0200 Subject: [PATCH] git: update to 2.50.1 - Refresh and rebase patches Signed-off-by: Richard Muzik --- net/git/Makefile | 4 ++-- net/git/patches/200-imapsend_without_curl.patch | 2 +- net/git/patches/300-openssl-deprecated.patch | 2 +- net/git/patches/310-fix-uname-detection-for-crosscompiling | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net/git/Makefile b/net/git/Makefile index 48d653749b..c62deea736 100644 --- a/net/git/Makefile +++ b/net/git/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=git -PKG_VERSION:=2.46.4 +PKG_VERSION:=2.50.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/scm/git/ -PKG_HASH:=0d5c029edfea24abb4cbda385eff2b66ae946dd74849a350e4420f1eefa71aad +PKG_HASH:=7e3e6c36decbd8f1eedd14d42db6674be03671c2204864befa2a41756c5c8fc4 PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE_FILES:=COPYING diff --git a/net/git/patches/200-imapsend_without_curl.patch b/net/git/patches/200-imapsend_without_curl.patch index 061a44341f..a0c02a24b9 100644 --- a/net/git/patches/200-imapsend_without_curl.patch +++ b/net/git/patches/200-imapsend_without_curl.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -1636,7 +1636,7 @@ else +@@ -1685,7 +1685,7 @@ else endif curl_check := $(shell (echo 072200; $(CURL_CONFIG) --vernum | sed -e '/^70[BC]/s/^/0/') 2>/dev/null | sort -r | sed -ne 2p) ifeq "$(curl_check)" "072200" diff --git a/net/git/patches/300-openssl-deprecated.patch b/net/git/patches/300-openssl-deprecated.patch index 16b5543a0d..67916d764e 100644 --- a/net/git/patches/300-openssl-deprecated.patch +++ b/net/git/patches/300-openssl-deprecated.patch @@ -14,7 +14,7 @@ Signed-off-by: Rosen Penev --- a/imap-send.c +++ b/imap-send.c -@@ -259,8 +259,10 @@ static int ssl_socket_connect(struct ima +@@ -263,8 +263,10 @@ static int ssl_socket_connect(struct ima int ret; X509 *cert; diff --git a/net/git/patches/310-fix-uname-detection-for-crosscompiling b/net/git/patches/310-fix-uname-detection-for-crosscompiling index 4b884d2984..85f464c425 100644 --- a/net/git/patches/310-fix-uname-detection-for-crosscompiling +++ b/net/git/patches/310-fix-uname-detection-for-crosscompiling @@ -22,7 +22,7 @@ Signed-off-by: Mauro Condarelli --- a/config.mak.uname +++ b/config.mak.uname -@@ -4,12 +4,12 @@ +@@ -4,11 +4,11 @@ # Microsoft's Safe Exception Handling in libraries (such as zlib). # Typically required for VS2013+/32-bit compilation on Vista+ versions. @@ -30,13 +30,11 @@ Signed-off-by: Mauro Condarelli -uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') -uname_O := $(shell sh -c 'uname -o 2>/dev/null || echo not') -uname_R := $(shell sh -c 'uname -r 2>/dev/null || echo not') --uname_P := $(shell sh -c 'uname -p 2>/dev/null || echo not') -uname_V := $(shell sh -c 'uname -v 2>/dev/null || echo not') +uname_S ?= $(shell sh -c 'uname -s 2>/dev/null || echo not') +uname_M ?= $(shell sh -c 'uname -m 2>/dev/null || echo not') +uname_O ?= $(shell sh -c 'uname -o 2>/dev/null || echo not') +uname_R ?= $(shell sh -c 'uname -r 2>/dev/null || echo not') -+uname_P ?= $(shell sh -c 'uname -p 2>/dev/null || echo not') +uname_V ?= $(shell sh -c 'uname -v 2>/dev/null || echo not') ifneq ($(findstring MINGW,$(uname_S)),) -- 2.30.2